Merge from trunk
authorJason Rumney <jasonr@gnu.org>
Wed, 20 Jan 2010 23:04:21 +0000 (07:04 +0800)
committerJason Rumney <jasonr@gnu.org>
Wed, 20 Jan 2010 23:04:21 +0000 (07:04 +0800)

Trivial merge